Prevent a crash with hidden, reorderable tabs. (#513230, Mike Massonnet,

2008-02-15  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Prevent
        a crash with hidden, reorderable tabs.  (#513230,
        Mike Massonnet, patch by Carlos Garnacho)

svn path=/trunk/; revision=19593

diff --git a/ChangeLog b/ChangeLog
index eaeb429ea97ad039b086a39bee43f1df661bd120..07b70057b751e780bddd4e99456bb18892ed4481 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Prevent
+       a crash with hidden, reorderable tabs.  (#513230, 
+       Mike Massonnet, patch by Carlos Garnacho)
+
 2008-02-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkuimanager.c (gtk_ui_manager_insert_action_group):

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 4fde43f85d202c4eadfad34b83ad331f3d9a1c6e..2a9d84ac3bf358e27241af92fb2b2d5d8eba2923 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2753,7 +2753,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
   else
     page = notebook->cur_page;
 
-  if (!page)
+  if (!page || !page->tab_label)
     return;
 
   priv->pressed_button = -1;